From ce67ef857b0f2cea5930a3adfb6b38956cbb2146 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 25 Nov 2019 11:23:39 +0000 Subject: [PATCH] Move gtk4-encode-symbolic-svg from gtk-4-examples to libgtk-4-bin It's more of a development tool than an example. --- debian/changelog | 2 ++ debian/control | 4 +++- debian/control.in | 2 ++ debian/gtk-4-examples.install | 2 -- debian/libgtk-4-bin.install | 2 ++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8ef31da97..d6bff9b554 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ gtk+4.0 (3.96.0-3) UNRELEASED; urgency=medium * debian/libgtk-4-0.symbols.in: Mark more Wayland and Vulkan symbols as (arch=linux-any). These don't exist on hurd-i386, and presumably not on kFreeBSD either. + * Move gtk4-encode-symbolic-svg from gtk-4-examples to libgtk-4-bin. + It's more of a development tool than an example. -- Simon McVittie Sun, 28 Jul 2019 10:59:36 +0100 diff --git a/debian/control b/debian/control index 74678fe9ef..5bb10c0749 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: gtk+4.0 Section: libs Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Emilio Pozuelo Monfort , Iain Lane , Jeremy Bicha , Michael Biebl +Uploaders: Emilio Pozuelo Monfort , Iain Lane , Jeremy Bicha Build-Depends: adwaita-icon-theme , at-spi2-core , dbus , @@ -130,6 +130,8 @@ Depends: gtk-update-icon-cache, ${shlibs:Depends}, libgtk-4-common (>= ${source:Version}), libgtk-4-0 (>= ${source:Version}) +Breaks: gtk-4-examples (<< 3.96.0-3~) +Replaces: gtk-4-examples (<< 3.96.0-3~) Description: programs for the GTK graphical user interface library GTK is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK is suitable diff --git a/debian/control.in b/debian/control.in index a6bc18ff79..5957245a8d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -130,6 +130,8 @@ Depends: gtk-update-icon-cache, ${shlibs:Depends}, @COMMON_PKG@ (>= ${source:Version}), @SHARED_PKG@ (>= ${source:Version}) +Breaks: @EXAMPLES_PKG@ (<< 3.96.0-3~) +Replaces: @EXAMPLES_PKG@ (<< 3.96.0-3~) Description: programs for the GTK graphical user interface library GTK is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK is suitable diff --git a/debian/gtk-4-examples.install b/debian/gtk-4-examples.install index 5e4151d454..39e346e554 100644 --- a/debian/gtk-4-examples.install +++ b/debian/gtk-4-examples.install @@ -1,6 +1,5 @@ usr/bin/gtk4-demo usr/bin/gtk4-demo-application -usr/bin/gtk4-encode-symbolic-svg usr/bin/gtk4-icon-browser usr/bin/gtk4-widget-factory usr/libexec/installed-tests/gtk-4.0 @@ -14,7 +13,6 @@ usr/share/icons/hicolor/*/*/org.gtk.WidgetFactory4* usr/share/installed-tests/gtk-4.0 usr/share/man/*/gtk4-demo-application.* usr/share/man/*/gtk4-demo.* -usr/share/man/*/gtk4-encode-symbolic-svg.* usr/share/man/*/gtk4-icon-browser.* usr/share/man/*/gtk4-widget-factory.* usr/share/metainfo/org.gtk.Demo4.appdata.xml diff --git a/debian/libgtk-4-bin.install b/debian/libgtk-4-bin.install index d26262cb46..641d1d63d7 100644 --- a/debian/libgtk-4-bin.install +++ b/debian/libgtk-4-bin.install @@ -1,8 +1,10 @@ usr/bin/gtk4-broadwayd usr/bin/gtk4-builder-tool +usr/bin/gtk4-encode-symbolic-svg usr/bin/gtk4-launch usr/bin/gtk4-query-settings usr/bin/gtk4-update-icon-cache +usr/share/man/*/gtk4-encode-symbolic-svg.* usr/share/man/man1/gtk4-broadwayd.1 usr/share/man/man1/gtk4-builder-tool.1 usr/share/man/man1/gtk4-launch.1 -- 2.30.2